From 67632a578bf8bfd9ba89238fd75985e7a1fa1340 Mon Sep 17 00:00:00 2001 From: Milan Bouchet-Valat Date: Fri, 12 Jun 2009 13:25:26 -0500 Subject: [PATCH] bgo#562579 - Don't show errors when the initial folder does not exist The previous patch for this bug was about the initial *file* not existing, but this also handles the initial *folder* not existing (such as /usr/nonexistent/nonexistent.txt). Signed-off-by: Federico Mena Quintero --- gtk/gtkfilechooserdefault.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 8731531bd0..f70b1f5d86 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -7050,13 +7050,14 @@ update_current_folder_get_info_cb (GCancellable *cancellable, } else { - /* Error and bail out, ignoring "not found" errors since they're useless: + /* Error and bail out, ignoring "not found" errors since they're useless: * they only happen when a program defaults to a folder that has been (re)moved. */ if (!g_error_matches (data->original_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) - error_changing_folder_dialog (impl, data->original_file, data->original_error); + error_changing_folder_dialog (impl, data->original_file, data->original_error); else g_error_free (data->original_error); + g_object_unref (data->original_file); goto out; @@ -7065,7 +7066,13 @@ update_current_folder_get_info_cb (GCancellable *cancellable, if (data->original_file) { - error_changing_folder_dialog (impl, data->original_file, data->original_error); + /* Error and bail out, ignoring "not found" errors since they're useless: + * they only happen when a program defaults to a folder that has been (re)moved. + */ + if (!g_error_matches (data->original_error, G_IO_ERROR, G_IO_ERROR_NOT_FOUND)) + error_changing_folder_dialog (impl, data->original_file, data->original_error); + else + g_error_free (data->original_error); g_object_unref (data->original_file); } -- 2.30.2